Skip to content

Fixes ffmpeg compilation w/ openssl 1.1.1#1579

Merged
AndreMiras merged 2 commits into
kivy:masterfrom
misl6:master
Jan 12, 2019
Merged

Fixes ffmpeg compilation w/ openssl 1.1.1#1579
AndreMiras merged 2 commits into
kivy:masterfrom
misl6:master

Conversation

@misl6

@misl6 misl6 commented Jan 11, 2019

Copy link
Copy Markdown
Member

This PR fixes ffmpeg compilation when openssl is in requirements list.
I've also added the scale filter.
Now, the ffpyplayer recipe is compatible with the non-crystax python3.

misl6 added 2 commits January 11, 2019 13:18
Merging kivy/python-for-android master
@misl6

misl6 commented Jan 11, 2019

Copy link
Copy Markdown
Member Author

I think that fixes #1294

@AndreMiras AndreMiras left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants